Adding quilt build-dependency.

diff --git a/debian/README.source b/debian/README.source
new file mode 100644 (file)
index 0000000..0e29e5d
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,8 @@
+gpsbabel (1.3.6-1) unstable; urgency=low
+
+  * Since this version the package uses quilt to manage patches
+    at build time. Please install the package 'quilt' and see
+    /usr/share/doc/quilt/README.source
+    for details.
+
+ -- Bernd Zeimetz <bzed@debian.org>  Tue, 06 Jan 2009 16:12:28 +0100

diff --git a/debian/control b/debian/control
index 53dd53093c8cf9f552c74cdbe41641b1695907f3..4bd38fb6f5ff692acf036d64286da687c9fc8376 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: gpsbabel
 Section: utils
 Priority: optional
 Maintainer: Bernd Zeimetz <bzed@debian.org>
-Build-Depends: debhelper (>= 4.0.0), libexpat1-dev, texlive-base-bin, texlive-base, libusb-dev, expat, libxml2-utils, xsltproc, libexpat1-dev, zlib1g-dev, docbook-xml, docbook-xsl, autoconf, autotools-dev, libpaper-dev
+Build-Depends: debhelper (>= 4.0.0), libexpat1-dev, texlive-base-bin, texlive-base, libusb-dev, expat, libxml2-utils, xsltproc, libexpat1-dev, zlib1g-dev, docbook-xml, docbook-xsl, autoconf, autotools-dev, libpaper-dev, quilt
 Standards-Version: 3.8.0
 Homepage: http://www.gpsbabel.org/
 Vcs-Browser: http://git.recluse.de/debian/pkg-gpsbabel.git/

diff --git a/debian/rules b/debian/rules
index 975bbab1de4f0f9f00005eecbca4063aa03f1779..2fc1d0b13ef7d97e23d502ce6789ae546d734b1a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,10 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
+#we use quilt to handle our patches
+include /usr/share/quilt/quilt.make
 
 
 CFLAGS = -Wall -g
@@ -21,7 +19,7 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 endif
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: patch
        dh_testdir
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
        cp -f /usr/share/misc/config.sub config.sub
@@ -45,16 +43,14 @@ build-stamp: configure-stamp
        mkdir debian/doctmp
        # Add here commands to compile the package.
        $(MAKE)
-       $(MAKE) doc
+       #$(MAKE) doc
        chmod u+x testo
        $(MAKE) check
-       #cd doc && make doc.dvi
-       #cd doc && dvips -o doc.ps doc.dvi
-       #/usr/bin/docbook-to-man debian/gpsbabel.sgml > gpsbabel.1
 
        touch build-stamp
 
-clean:
+clean: clean-patched unpatch
+clean-patched:
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp dep doc/*.ps
@@ -79,7 +75,6 @@ install: build
 
        # Add here commands to install the package into debian/gpsbabel.
        $(MAKE) install DESTDIR=$(CURDIR)/debian/gpsbabel
-       #install gpsbabel $(CURDIR)/debian/gpsbabel/usr/bin
 
 
 # Build architecture-independent files here.